Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CASMTRIAGE-5798 release/1.5 update iuf-cli rpm to remove recursion error #2696

Merged
merged 2 commits into from
Aug 14, 2023
Merged

CASMTRIAGE-5798 release/1.5 update iuf-cli rpm to remove recursion error #2696

merged 2 commits into from
Aug 14, 2023

Conversation

leliasen-hpe
Copy link
Contributor

Summary and Scope

Update iuf-cli rpm to remove recursion error when bootprep directory and media directory are the same.

Issues and Related PRs

Pull Request Checklist

  • Version number(s) incremented, if applicable
  • Copyrights updated
  • License file intact
  • Target branch correct
  • CHANGELOG.md updated
  • Testing is appropriate and complete, if applicable
  • HPC Product Announcement prepared, if applicable

@leliasen-hpe leliasen-hpe requested a review from a team as a code owner August 14, 2023 18:49
@leliasen-hpe
Copy link
Contributor Author

/backport release/1.6

@github-actions
Copy link

Error occured while backporting into branch release/1.6.

Error
git -c user.name="Lindsay Eliasen" -c user.email="[email protected]" cherry-pick 9eefa580dd118ef6b1e647010d9079e282ad3de9 -x
Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
Auto-merging rpm/cray/csm/sle-15sp4/index.yaml

error: could not apply 9eefa580... CASMTRIAGE-5798 update iuf-cli rpm version to get rid of recursion error

hint: After resolving the conflicts, mark them with

hint: "git add/rm ", then run

hint: "git cherry-pick --continue".

hint: You can instead skip this commit with "git cherry-pick --skip".

hint: To abort and get back to the state before "git cherry-pick",

hint: run "git cherry-pick --abort".

@leliasen-hpe
Copy link
Contributor Author

manually backported to 1.6

@denniswalker denniswalker merged commit ea073d6 into release/1.5 Aug 14, 2023
1 check passed
@denniswalker denniswalker deleted the CASMTRIAGE-5798-release/1.5 branch August 14, 2023 19:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@leliasen-hpe @denniswalker